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

* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows