Add Android Support package, more tweaks.