Just use int(BOOL) to convert to 1 or 0

(This is split out from I24461f4328e188c8983ad574495e11e033ec5ba4 on
neutron, which was a hunt to remove "PRED and A or B" deprecated ternary
idiom.)

int(bool) already returns only 1 or 0 - no need to do our own explicit
version.

Change-Id: Ib482d6cb63ece7e1d5073fa7dc1c7daf9db8a0b3
Merge "Just use int(BOOL) to convert to 1 or 0"