Merge \"Fix merging HLoadClass with HNewInstance.\"
am: 8bf8117c6b

Change-Id: I302aaa937e92fe2f1612833b1733e9f40da994cc