Merge "libhidl_gtest_helpers -> libhidl_gtest_helper" am: 454c6ee1a0
am: c0dcc39899

Change-Id: Id4377041c7fa2c948316435b0b85c358a8a15fc7