AI 143400: am: CL 143272 am: CL 143256 Make the Term emulator work with the most...

  + Makes the "Enter" key work again.
  + Makes the "Delete" key delete just one character each time you press it
  instead of two.
  Original author: jackpal
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143400