Merge "Filter and colorize javac output V3" am: c8387929d1
am: f4ef1db272

Change-Id: I5f311894a553df99c0a77671d60dcc24250fcdb7