add development from Android 2.3.7_r1