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

Change-Id: Ie80979ffefc60def57dd4328ed4d2311de7f742d