am c365306d: am 93be76f5: am e8e73b01: am 311a4758: Merge "Remove system/core\'s remnants of SH support."

* commit 'c365306d403dc1f9a58c8cce5f993a8ea95e6576':
  Remove system/core's remnants of SH support.