Readd Email and Exchange apk

Change-Id: I029251cb717350a9471eb00d8ac6a58f8fa15a23