Merge branch 'analyze_fixes' of https://github.com/flutter/flutter into analyze_fixes

# Conflicts:
#	packages/flutter_tools/lib/src/commands/analyze.dart