Merge "Convert java/Android.mk to Android.bp" am: c5be3c7e71 am: 1d5684dcfd

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

Change-Id: Ieb2ff68a926bc419ede65746c8df89ff05048edb