am f4b4825b: am 5fe615c4: Merge "Fix histogram intrinsic."

* commit 'f4b4825b4769cb2d9cf6fa3787e535f68f0f32a6':
  Fix histogram intrinsic.