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

Change-Id: Ic42ad5b73227169825c2df701fbf2ca8afd9bd1a