am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1

* commit '3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
  Eliminate hw.keyboards system properties.