Merge "Add compat symlink preferred-arch /system/bin/dalvikvm." am: ef3429dae6
am: 3c469804ed

Change-Id: Ic2d297ec3ca9fcd217d7fe49b288b77d254887c2