Merge "libhidl_test: remove flake"
am: 9de3ed09b6

Change-Id: I96d33e845e9c0470b65f8573aec2224c4a23dc4e