Merge "Make libdex structures tool friendly." into dalvik-dev