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

Change-Id: I1e41465044ad57a9786732ade21bcffc7ca72bf1