Merge "Vibrator: Remove Android.bp that's using .mk syntax"