Android S Beta 3
Merge "Convert java/Android.mk to Android.bp" am: c5be3c7e71

Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1691320

Change-Id: Icfdbca9268af337cb835fc535cb27afe4ded7431