Merge "Migrate Email to aapt2."