am 5ed25acd: am 25a7d5f8: Merge "Move native bridge library in system/core"

* commit '5ed25acd4ab7c606986c77892c07c2914f8df8f2':
  Move native bridge library in system/core