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

Change-Id: I93f234a9ad94e4b816b6c57b390235a7698b4af7