Merge "Convert more bionic tests to Android.bp"
am: a547762ae3

Change-Id: I0f69f0ba21377373cc1ddb4ce336de2876553618