Merge "Fix oatdump and valgrind." into dalvik-dev