Merge "Port libtestUtil to use Android.bp" am: 700c1b0b57  -s ours
am: b357adcec1  -s ours

Change-Id: I6f1dbc45a012a346fe156314762bd4fe6cbb439e