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

Change-Id: Iff4d3cefd6dad6ffffd18859b8f5645f40879258