Merge "Add compat symlink preferred-arch /system/bin/dalvikvm."