am 31629651: Merge "Frameworks/base: Fix more aapt issues"

* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues