am c346fafc: Merge "Fix namespace inconsistency in .so loading patch"

* commit 'c346fafcfb1a37031229d01f5ae839c5e2fb6fdf':
  Fix namespace inconsistency in .so loading patch