am 45a3ad7d: Merge c1efb060

* commit '45a3ad7d225495367a47440da118609b4940fe71':
  Relax the constraint of 64bit build environment.