am 3fe22e6b: am 90b80de5: Merge "Support shared-subtree and bind mount flags." into jb-mr1-dev

* commit '3fe22e6b26b88a07b391ba6a11807610251128af':
  Support shared-subtree and bind mount flags.