Merge "Dalvik: Fix dexmerger test" am: e65ce16e31 am: 0c4a03ff26
am: c913194650

Change-Id: I16c8141a113ad7fea6bf629440cbbb5cb1ed09da