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

Change-Id: Ifc00abfa474a7903464ad98be3698cf4d8e8d56e