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

* commit 'effd416ee3c05c6c378614995fdbe514c8423a48':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows