Email: Remove aapt warnings

Change-Id: Ibf0a9cf7f73e6f2818d32ebd2c61a4922e34bbe9