Merge "Remove TEST_VM_IN_ECLAIR." into dalvik-dev