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