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

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