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

Change-Id: Ia8939ce32dce7c78427060db409820bad5b9a959