am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev

* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
  Make the NullVibrator really null.