Merge tag android-4.4.1_r1 into HEAD

Change-Id: I17939d51f966afcee2c3cc2e094d1b3fdb239d30