Revert "Revert "Merge branch 'rekey-android'""

This reverts commit 7352d2b6ecdd0e9e29f4ff155e3e49d2cb1fbed1.

Conflicts:
	lib/importer/android.rb
	lib/localizer/android.rb
	spec/lib/importer/android_spec.rb
Better way of doing this Android rekeying stuff