Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1

Change-Id: I3545346238ddaaec8c1a947f00aaeadd12dfd63b