Merge "Convert Android.mk under system/extras/tests to Android.bp" into main