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

Change-Id: I39d7979d45b841baf3317315c2015ab14ae7fde7