Merge "Fix PIC default to be -fPIC"