Upgrade to NDK r9b
Change EXTRAVERSION to differentiate binaries