Update frameworks/base to new compiler filters.

Also fix a merge issue with duplicated code.

bug:34715556
Test: build and boot aosp bullhead
Change-Id: I3b913878c83f708e752ec06f79bada1873213823
5 files changed