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

Change-Id: Ib6df6bd84dff1e71d3e660b57efcb9e05bd2d35a