Fix android common/helper