Merge "cs40l25 vibrator implements AIDL interface"