improved Makefile for packaging and added targets for Android package