Merge "Restore libhidl_test Android.bp" am: 520ecd4ec1 am: ea0f519afc
am: 6b89cccefc

Change-Id: I0ea5e230a4ca97c280823e6160aa5fb80589d6ca