Merge "Take advantage of new audio-coupled haptic patterns." into pi-dev
am: 684e933609

Change-Id: I1a6f896508443a12833a0e8d18b733eae54df9f3