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

Change-Id: Ic76bc86051a7391ba188c79a186cdd84ffd6f1b3