Merge "Pass --legacy to aapt2 compile for Dialer" am: 058ddde95e am: 37030b0a5c
am: 43b2886312

Change-Id: Icaa306eda1f7f47ba7ce32e9d83842bea266c30d