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

Change-Id: I2cf17b5bf8c9e743d2fd9533515cc941db70b036