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

* commit 'b6e9fb0606e0b850cb8763848caab2bc8c426229':