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

Change-Id: Ie235a8beb53511e1a3704cb17d0c6fd596443a1f