Android 4.2.1 release 1.1
merge in jb-mr1-release history after reset to jb-mr1-dev