Merge "dalvikvm: create the dalvikvm symlink to the primary version"