Merge "Clean up dex_file a bit"
am: 4e17a9c333

Change-Id: Ieefd48dcd0fac840795e254374fb92f0096ee837