am 3e0289f5: Merge "Native crash SIGSEGV bad ptr from /system/lib/libdvm.so"

* commit '3e0289f54abff3a9ad6c0b11ff828a5ad3c05271':
  Native crash SIGSEGV bad ptr from /system/lib/libdvm.so