Merge "Fixed NoClassDefFoundError when USE_SCRIPT_COMPILE_CACHE is set to false"