Merge tag 'android-4.4.1_r1' of https://android.googlesource.com/platform/packages/apps/Camera2 into kk4.4

Android 4.4.1 Release 1