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

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