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

Change-Id: I53f22489c27a699ec77cb386417c6924c979e594