am e9c97436: Merge "Remove some of the x86 libdvm.so text relocations."

* commit 'e9c974368133f15413ad80222be41fdca92630b5':
  Remove some of the x86 libdvm.so text relocations.