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

* commit '43efcea03e3f266f68fed1a01946c4474511f8f7':
  dalvikvm: create the dalvikvm symlink to the primary version