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

Change-Id: Idc96c3eadb09290d58a005814c79299a6108f321