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