Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b am: 443ef0243d am: 570199e8ab
am: e5bf830ea2

Change-Id: I7dd4299f24c7af4385b49757f51057fda257c418