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

Change-Id: If72d09c77083ab25f01e693eabb400df586bf42a