am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev

* commit '581dfee1502375bb49fac43af27d8df43e71d51b':
  AAPT: Fix issue with synthesized resource not actually showing up