am 7c6fd11e: am e9fd9b23: am 1da6b1fe: Merge "load ro.recovery_id property from recovery partition"

* commit '7c6fd11e9a53aa85de30f4a60f4b0ea1d2ee8a8a':
  load ro.recovery_id property from recovery partition