Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." am: 4ed5735a68
am: 733ba8f0e4

* commit '733ba8f0e473b214e55e3b93ded7739c35d85b10':
  releasetools: Fix the bug with TARGET_NO_RECOVERY.