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