am ecee80b8: am cec57d04: Merge "Revert "Change the list of recognized .rsh files""

* commit 'ecee80b837f5fbd2be56a5b33cabce675853b1cd':
  Revert "Change the list of recognized .rsh files"