am 260b0f50: am 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"

* commit '260b0f50e97794d5663de55664e3ec554e216dc3':
  hardware: fix check for ro.hardware.<class> property