am d3b5d574: am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."

* commit 'd3b5d574defd565d6e810cbb86e3943837f94065':
  More consistent use of 64-bit build variable.