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

Change-Id: I6c3e196f4b3c38963b106df28e7f1ec2761a17d7