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