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

Change-Id: Iae6fb746767ccf2efa90bdc4ce5b19cc2adc6086