Android 4.0.1 release 1.1
Merge "Fix off by one error when converting between unorm8 and float." into ics-mr0