am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was...
am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit '83fae208':
AAPT: Fix an issue where a resource name was incorrectly derived on Windows