Changed android code generator as well as runner