Removed android jar conflict