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

Change-Id: I544040f49a05d73db8d31db7a3cb01c5b9907b2a