Fix cherry pick of multiple changes

Second and additional changes in the same submit attempt must be built
on top of the previously cherry picked change, not the branch tip.

Change-Id: I9183f68b5780af1f28cb357217663e4bdb2d4e76