Merge changes from topic "oth-b123003088"

* changes:
  Fix cpplint guard warnings
  Remove kludge for duplicate jniThrowNullPointerException
  Clean-up exported API