Merge "Revert "Remove some of the x86 libdvm.so text relocations.""