android-5.0.0_r7 and some other changes