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

Change-Id: I8661abf7f50b36322e085852aac54e419cc75fb8