[automerger skipped] Merge "ARC++ swap for AppFuseUtil" am: e7a9d5fbbd am: 5c6aaa3498
am: 41672dc992  -s ours

Change-Id: Ie103a2efa58f49ef90c84ef97db20332677fd859