Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev