Merge "Update frameworks/base to new compiler filters." into oc-dev
am: e4f36952ab

Change-Id: I37102edeba93a4b18c943c16946b609f04c1f0eb