Merge remote-tracking branch 'aosp/kitkat-mr2.2-release' into kitkat