Merge "Add check that map offset is sane to DexFile object init." am: d58d0841b4
am: 6e0f98260f

Change-Id: Iaff347a3f576f4bab5a4b2c6fa96755437f76eda