Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b
am: 4cbedcc679

Change-Id: I37af5d1ae1be07d6c1b233f5cf25896339db51cd