Merge "Mark libbrotli as recovery_available for update_engine_sideload" am: 7239b14f7c
am: 2919001f63

Change-Id: Idd7e2c598bfa5b4a558ecd5d3680db06e59c1b79