Aosp common/android 3.4