Merge "Fix merging HLoadClass with HNewInstance. am: 2b8b6040 am: 2e703b96" into nyc-mr1-dev-plus-aosp