Updated android plugin
Updated android plugin and changed java version to 1.6 for testing