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

* commit '8ddf335a01cb9e83ceadd314739899895c84f0e1':