am 25cc1017: am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."

* commit '25cc1017cd7dd315880f75ea95afc4ed44a86b26':
  Set mode bits for /system/etc/recovery.img.