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

Change-Id: If7d331114ebce4a96a0e0d22c7d94b3bb7ed0aca