Merge "Add a little bit of paranoia to the odex data reader." into dalvik-dev