Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev