am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"

* commit '6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52':
  recovery: change the way of rebooting when using power key combo