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

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