Merge "Revert "Disable 639-checker-code-sinking in PIC mode.""