Merge "Fix potential null read for truncated dex files"