Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev
am: ab23aa7667  -s ours

Change-Id: I4988d06cb6c53ed1384b2c7bef19afa23adc5dc6