Merge "Fix issues in 32bit PIC enabled build"