Lol, restore aosp email, kufi is doing an amazing job on it

Change-Id: I450de3c1a2e4db68b62d3b8ca40ce6a8d079f920