Merge "hardware: fix check for ro.hardware.<class> property"