Merge "releasetools: Always use recovery mount options." am: 643d466f7b
am: 1709cf3768

* commit '1709cf3768b54c1abc267b5ee92f57023e206c26':
  releasetools: Always use recovery mount options.