Merge "Mark libbz as recovery_available for update_engine_sideload" am: bf89db82dc
am: 3ddd099912

Change-Id: I705d308717869cacd60e69478054ffef4871433a