Merge "Update frameworks/base to new compiler filters."