Merge "Port libtestUtil to use Android.bp"