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

Change-Id: I7b16e7b90ad473581216dda7f991245d7a71525d