merge in @olddroid's compiled aosp userdebug of 5.0.0_r2