Merge "Mark libssl as recovery_available for update_engine_sideload" am: eba0b62d87 am: 1476894103
am: 14ca516655

Change-Id: I9fb93c7925a753dc525b02b0508804a49c479b4b