Revert "Android Helper Refactor"

This reverts commit 67d5dedcbe6df6ca17a8e46bdf0cc441cca6c6ec.