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

Change-Id: I0b748f49d733e37e6b1f58beac1dfb5ccf6acdd3