Revert "fix build"

This reverts commit be986941ce986f160b196707313b1eb50e6dfea1.
Revert "cleanup"

This reverts commit 75287fca6d1ebcd1251349aad7284067e7b579a7.
Revert "Revert "cleanup""

This reverts commit fb3966703de575d6d9ff53f853bcac37af2df583.
revert cleanup on Android.mk
fix derp