Merge "Add a command line option to suppress compilation errors" am: 419ef1bf8e
am: 14895d4c88

Change-Id: Id540ebb8ad6523078613abb1776164b37b1a619b