Merge "Use PatchObjectVisitor for app image class set patching"
am: 6cd9314c7f

Change-Id: Ie900292e120cd37573fe2e2e4d4d5f094c30cc6a