Merge "libhidl_test: remove flake"