Use mapnik-packaging with Android buidl fixes
Fixed missed merge and bad code
Various fixes for compiling on Android