Revert "Merge branch 'kk' of https://github.com/snak3ater/android_build into kk"

This reverts commit 8ebd273425e8249e26dabce81551bcd2f95b468d, reversing
changes made to 78b5f5de85149122a1c3dbde93f45bb782cc9efc.