[automerger skipped] Merge "Add dalvik.vm.dex2oat-resolve-startup-strings feature flag" am: 692bc1f89c am: 16eae49bd9
am: e3ad8bc346  -s ours

Change-Id: I6f13b3b76342c8dc334c363a5b0caf3a246efd98