Change Email2 reference back to Email

Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Merge "Change Email2 reference back to Email"
Remove HAVE_DLADDR from AndroidConfig.h.

Change-Id: I014ce98c61b12169e381b769af34b682df46087e
Use += to append to target-specific PRIVATE_CLEAN_FILES

Instead of incorrectly including global variable PRIVATE_CLEAN_FILES

Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
Merge "Remove HAVE_DLADDR from AndroidConfig.h."
Merge remote-tracking branch 'android/master'