Add AOSP Email to the build

Change-Id: Idf282b0dd172f83afc3fba4790e8a01a30e632a3