am ad1930cf: Merge "Add build fingerprint and ensure match on .so load"

* commit 'ad1930cf38d6a0a0e97f6ccacd7ecae96504f831':
  Add build fingerprint and ensure match on .so load