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

* commit '701318227c322f78a7cb466961b9a058e91a7eb9':
  dalvikvm: create the dalvikvm symlink to the primary version