am 20ae1d77: Clean up native bridge

* commit '20ae1d77463d1c3f206eac8d541124b4555464de':
  Clean up native bridge