Email: Update copyright year

Change-Id: I7c2c817c409c97be1625ff273bf3048eaf799fae
Email: Remove aapt warnings

Change-Id: Ibf0a9cf7f73e6f2818d32ebd2c61a4922e34bbe9
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0