am 7aede64a: (-s ours) am ea52030b: (-s ours) am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev

* commit '7aede64a0a5963611a888820b273dd6c60c305cd':
  Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"