[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available
am: 738e0dcf0a

Change-Id: I9de236b53b4f4f449de65bfb856771278b92fa9e