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

Change-Id: I2b894484c028fc1d886e45f7c4c74ec0d37be0e7