Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev
am: bba43b374b

Change-Id: I0a481621a85ff28894518b0c7357b19c1df6eec0