Merge "Revert "Android.mk: Enforce SYSTEM_EXT_* vars on API >= 31""