Merge changes I98f1319d,Ic15fe28f into main

* changes:
  Change return value when NDK symbol isn't present
  Change return value when NDK symbol isn't present