Merge "libinit_test_utils: -= libhidl-gen-utils header" am: 1da736cb3a am: bd7792fa19

Change-Id: I42a96e68fab5a204863cf7ab6139f763f2dabe71