am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev automerge: 4499888
automerge: 4308c2a

* commit '4308c2aea45a4780b460734ee8634d74205c15c5':
  Fix AAPT daemon mode with paths containg spaces.