Merge "Update ARM assembly patch"