Revert "Updates for Android implementation of native achievement display. Various cleanup in Makefiles."

This reverts commit 17cb32a28d23bb8f81a615650e032d6466defea6.