Merge "Re-generate dex IR to verify dex file"
am: 6dd3e7a595

Change-Id: I9c2c80392d254d605862b5e22ea65a190e5933fa