am c399a2ca: merge from open-source master

Merge commit 'c399a2caea7660b7e6ed6f816440edd73ba7ff37'

* commit 'c399a2caea7660b7e6ed6f816440edd73ba7ff37':
  Don't prelink dalvik for x86