Merge "Use 'dalvikvm' only to test dx." into dalvik-dev