Merge "Convert frameworks-base-testutils to Android.bp"
am: de2bfe1ddf

Change-Id: Ib543af4cb90c84d9914178912a2834ac869c908b