Fixed package names for android code