Merge change I481a23b9

* changes:
  [msm7630_surf]: Add key mapping to boot into recovery mode.