am 7003ff3b: am 8f087d02: Merge "update tools for making recovery images"

* commit '7003ff3b54e9081dba92ecfea0594355af40e6dd':
  update tools for making recovery images