Android 4.1.1 release 6
merge in jb-release history after reset to jb-dev