am 30b96ba7: Merge "Use ro.hardware property to detect the device"

* commit '30b96ba70d50d4c0ce6b990eefbb27cb150ee338':
  Use ro.hardware property to detect the device