am 5c151c4a: (-s ours) am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."

* commit '5c151c4a4b8c9e6aa0d9dd06eedebc7277963a13':