Merge "Disable 639-checker-code-sinking in PIC mode."
am: 61758b9f3a

Change-Id: I411ab05ccfa0730b8fc24600dace5504917afffb