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

Change-Id: Iaf9321fa9a84400b7e5b93f0a7af838e1930ccd6