Merge "Revert "ARC++ swap for AppFuseUtil""