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

Change-Id: Ibedb1e427ecd68b091b2d4388f52b8fbf5c9c2f8