Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev am: bba43b374b am: 2baa65a507
am: df70b14c2c  -s ours

Change-Id: Id17f53cdfe659699fda5e69b4b7d833e4e7b8be2