Merge "Remove unused system/extras/tests/Android.mk" into main