am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the recovery image."

* commit 'cc368fdea6e5415be541dadfe04107b76a82c537':
  Install the recovery binary directly to the recovery image.