Merge "resourceloader: Remove PHP4-compat code"