Merge "Move all hidl_test dependencies to the system.img"