Merge "Fixing vogar script to use the latest name" into dalvik-dev