Always flush batch before stopping

There doesn't seem to be any reason not to flush locations before
stopping a batch. This is extra location information that has been
collected anyways.

Test: presubmits
Change-Id: I058d9eeefcf70be55b035e4469eb729826ac28da