Merge "Add --source-path flag to AAPT2 compile"