Merge "Move DexException to dx.util." into dalvik-dev