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

Change-Id: I7a0f751d0ab2934435bfd0ed335308250b21f872