Merge "Pass --legacy to aapt2 compile for DownloadProvider"