Merge remote-tracking branch AOSP/kitkat-mr2.1-release