Merge "Fix HClinitCheck elimination in instruction builder." am: bbd2cc2e23
am: 1926fcf1e8

Change-Id: I0abde94315a2764bd6c5ce53b0f578c55241eb02