am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support...
am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)
Merge commit '3dba40da'
* commit '3dba40da':
remove the notion of "root path"; support mixed flash types (do not merge)