Merge "Rename MODULE_EXCEPTIONS to APK_EXCEPTIONS"