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

Change-Id: Idff0ca6b5a9b12252a0a566cc92bb144e4fdd215