Merge pull request #2679 from Hixie/overrides

Add @override annotations to flutter framework