[automerger skipped] Pre-resolve dex cache strings before collecting string offsets
am: 05b3f793bb -s ours
am skip reason: change_id I39235c6b4fa43a89e7082962d1c7d4643748d078 with SHA1 fe0e00a4d6 is in history

Change-Id: I636a90e50c7e911e9aee7b96988ac6f137662f03