Merge "Mark libpuffpatch as recovery_available for update_engine_sideload" am: a46714d7 am: df47eb1a am: 2848673a Change-Id: I515aec67873b85fde2afe6e9ef53a9474e6cb1cf