Merge "ARC++ swap for AppFuseUtil"
am: e7a9d5fbbd

Change-Id: I50df9e5cc7812d2dee248acc360e0f5840b6a2fc