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

Change-Id: I52c4d423d76790f10d2a3816cfd26dc3945eb903