Merge "Update frameworks/base to new compiler filters."
am: 431bc34096

Change-Id: I2eb42fb2aad718f71c8c0a7a81ca4e17d0aaa9c5