Merge "Move all hidl_test dependencies to the system.img"
am: 46bb27e614

Change-Id: Id46ab1835638aec6c98f0b2775774cb4cc0c34dd