Updated to build against latest Cinder/android-dev