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

Change-Id: I19bfb0fff74e9660029f8a6eee4dd010d2f6c702