Fix android common/device test