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

* commit '1663c75fa7e83547f3aefc6128f2b90776de5639':
  Make the NullVibrator really null.