Merge "libhidl_test: remove flake" am: 9de3ed09b6 am: 1d6e0e668c
am: 7657b1425d

Change-Id: Id867ee7939ffcebd752df15b7c55c01c8131077a