Android 4.1.2 release 2.1
merge in ics-release history after reset to master