Merge "Remove the path hardcode of lib for 32/64bit support"