Merge "Add a couple scripts to fixup version scripts."
am: 87d9b0a9fa

Change-Id: Ide0157bb64979269804eb9d37a9397ee3495e3b2