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

Change-Id: I01c7d2d2500d1d5c64cf8f1ed9d2901309ca9edd