am f4e25916: am dc7e8177: Merge change I0f505e57 into eclair

Merge commit 'f4e259165d50031ac71b2d135b686c7658cf298f' into eclair-mr2-plus-aosp

* commit 'f4e259165d50031ac71b2d135b686c7658cf298f':
  Checkpoint new rollo scripts.  Not currently in use.