Merge "Remove haptic primitives that aren't ready yet." into rvc-dev am: 6bd4a7ed am: ac66cecf am: 6a89b64f am: 13fafacc Change-Id: I2c7749bac19e983b09298cc292b3cc47092e8d83