Merge "Insert cpu.model back in for arm v7 images." into idea133