Merge "add missing GET_GOT/RESTORE_GOT pairs"