Merge "Finish adding checks to dex ir verification." am: 998e42aac5
am: 2ead0ac5c9

Change-Id: Id70aaf0214e82ec897d852dd84cecfaa726c579b