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

Change-Id: I8d91ba35477d526ff886ed32c7c1357134dfca4d