Update AOSP tag to android-5.0.0_r6