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

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