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

* commit '510c24e8930447811f6725cbf7f3cefec2194a5d':
  Fix AAPT daemon mode with paths containg spaces.