Merge "resourceloader: Remove back compat for old packageFiles format"