Merge "Add wrapper for IVibratorManager.aidl to native vibrator service"