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

* commit '8f087d024619467de8609656e8a14370f24b817c':
  update tools for making recovery images