Merge "Move dumpkey tool to the recovery repo."