Merge "Keystore 2.0: Rename legacy_migrator to importer."