Merge changes I2e05b016,I8ff36f37,I302bbe8d

* changes:
  cronet import: let script create upstream-import branch
  cronet import: add flag to set --force
  cronet import: make last_rev optional