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

Change-Id: I052433e85698a2a593653f80223cdd4bc2661781