Merge "Update build files to new compiler filters." am: 6c8c20dd5b
am: 39568a6783

Change-Id: Ic31ecc16969b15f961f8126bade07a7daf42ec9d