Merge "Track the change to update_engine_sideload path." am: 97de9c3d3e am: 07c78fe446
am: ddcb99b801

Change-Id: I2fe1f26a048949f46c0512f6163868f11b7a5928