Adds unified corewrapper in android makefile