Merge "Add dalvik.vm.dex2oat-resolve-startup-strings feature flag"