Merge "hasVibrator() should only report presence of built-in vibrator." into jb-dev