Merge commit 'Merge branch 'kitkat-mr1.1-release' of https://android.googlesource.com/platform/build into kitkat' into myth-4.4