am cf4e6a72: am 8078df97: Merge "Make sure that ro.dalvik.vm.native.bridge is always set."

* commit 'cf4e6a722c22eb333a1520847052e54901531541':
  Make sure that ro.dalvik.vm.native.bridge is always set.