am 19560508: Move flags belonging to BinaryFormat to the right place.

* commit '195605084ed156b58f0bae002f121d98c1ace867':
  Move flags belonging to BinaryFormat to the right place.