Merge change 24897 into eclair

* changes:
  First cut at a tool to perform automated syncs from Harmony to Dalvik.