Merge "Pass --legacy to aapt2 compile for DownloadProvider"
am: eda6814cc2

Change-Id: I93fa459e3ed9c6433350af1efa3373d287b29490