Merge "Fix potential null read for truncated dex files"
am: 0efe3243d4

Change-Id: I1054c363883d74111927c33b3f70de47bd60e658