am 6ff84956: Merge "Fix PIC default to be -fPIC"

* commit '6ff849568c94c53c8a722f71f33c1e688ebbed74':
  Fix PIC default to be -fPIC