Better way of calculating Android keys
Merge branch 'rekey-android'

* rekey-android:
  Better way of calculating Android keys