Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	src/com/android/email/provider/DBHelper.java
	src/com/android/email/service/ImapService.java

Change-Id: I27fe83fabe89d0fd8fcbfced566aa36103f560e5