Android 4.1.1 release 2
merge in ics-release history after reset to master