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