Merge "Add handling for PH property dex2oat_resolve_startup_strings"
am: 25d4688e91

Change-Id: I0a2ec9718664ce5c7664694656e0b6c434589927