Merge "Pass --legacy to aapt2 compile for UnifiedEmail"
am: c7c9b11ad3

Change-Id: I37e33ca17ecb4fcf6fba4a41a24706b25e297916