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

Change-Id: I981b49ded873bc2ab74421f408101388b6a0dba1