update makefile to use new Android dir structure and Proguard 4.8