Merge "Inherit base system_ext.mk files for aosp targets"