am fd50d4de: am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."

* commit 'fd50d4dec3e57ebf1877021a242659b668788a95':
  Allow custom recovery resource dirs.