Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into mnc-dr1.5-dev...
Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into mnc-dr1.5-dev am: b84295d0 am: bbaa2b29
am: 234a846a -s ours
* commit '234a846a':
[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available