Merge "Android.mk: Support SYSTEM_EXT* sepolicy"