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

Change-Id: If6ca22cb45462bb934e2195e3a213359d9c09e99