am 8ddf335a: am 44998887: am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
automerge: 3efee70

* commit '3efee706af3b9b9ff12c525b032f36f59eb66c80':