Revert "Merge branch 'rekey-android'"

This reverts commit 860c41a223f2554c60d465ebaac20892f3fca1af, reversing
changes made to e4439e56d38ba8c3696bb0cf7a85e808943781f6.