Updated  to work with android-sdk-plugin 0.9.x