Fix Android common/helper