am 63f2770d: am ad0a55bd: Merge "Remove the path hardcode of lib for 32/64bit support"

* commit '63f2770d002dd583e35f1274d7c1322133c9eb66':
  Remove the path hardcode of lib for 32/64bit support