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

Change-Id: Ia4ddd7519ea0d3124f1deb587fe11bf2c8f2def2