Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL"

* changes:
  Revert "Change HIDL fmq tests to use int32_t for payload"
  Revert "Add template parameters to MQDescriptor"