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

Change-Id: I21227e9ca0dd9d4a90098e6e5cde49082bab4d4f