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

Change-Id: I347f8dad0ba55575eefba059a4a8c9f4371fca1b