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

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