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

Change-Id: I47a7612b5000ead27229108f2efac1269be26008