merge android-3.3 for compiling