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

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