Merge "Add dalvik.vm.dex2oat-resolve-startup-strings feature flag"
am: 692bc1f89c

Change-Id: I71aceedfd1c77ebad0bbe244de2db53140ddbac6