Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev