Pull latest aosp android-4.4_r1.2

Change-Id: I8fbcb628b94ba86ceb90fa9e3f4c133c079e36b6