am 03dce8ca: am eff16fb8: Use symbolic constants when computing bits-per-word.

Merge commit '03dce8ca75c05f0588ceb5db4b236746e8f445e7'

* commit '03dce8ca75c05f0588ceb5db4b236746e8f445e7':
  Use symbolic constants when computing bits-per-word.