Merge "Fix two dex file structural verification issues." into dalvik-dev