Merge "Add handling for PH property dex2oat_resolve_startup_strings"