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

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