Merge remote-tracking branch 'aosp/kitkat-mr1-release' into kitkat
Fix strict-aliasing violations