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

Change-Id: If7a0e6dd7caafddfa710bdf6f3f92fef168692ba