am b960d57a: am d7cfdd87: am ad1862c1: Include Email in emulator system image

* commit 'b960d57ab19118a8af6b9d7640668f580c8b2b45':
  Include Email in emulator system image