Upstream android-5.0.0_r7 to android-5.0.1_r1