[art] Fix, re-enable and expand 596-app-images am: 7c918ee21f

Change-Id: I6a34c4db6b066a6e59789ca21bb39a655791bb10