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

* commit '2428eaa319bfd0481f49e364c4f242300f4ed291':
  hardware: fix check for ro.hardware.<class> property