Merge "Update build files to new compiler filters." into oc-dev am: c4b1823c79
am: af8dcec48d

Change-Id: Ieba5ff7611f8a0d00102a3961c84ad0edba570e3