Merge remote-tracking branch 'aosp/kitkat-release' into kitkat