Moving to android-5.0.1_r1