Track dalvik and libcore upstream again