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

Change-Id: I9456687ee58b66fd06171833be29f9671c3981ee