Merge "system/core: delete an old patch file"