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

Change-Id: I516b0a177f66b6a3c1e51b2f470a29c8d2913780