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