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

* commit '065bbe9760534b96cc775ecbddc1f22a18a7b6bf':
  dalvikvm: create the dalvikvm symlink to the primary version