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

Change-Id: Ieb923ef2f5d2338bb271d27b40493adea9d6507c