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

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