Update frameworks/base to new compiler filters.

Also fix a merge issue with duplicated code.

bug:34715556
Test: build and boot aosp bullhead

(cherry picked from commit be7b0d18)

Change-Id: I2c716427ac10090a694ce933421e4924748b0c71