Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into mnc-dr1.5-dev
am: b84295d027

* commit 'b84295d027c9d86720d93e19eb5c1b644553d647':
  [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available