Merge changes from topic "clang-format-jni"

* changes:
  Apply clang-format
  Header file changes before clang-format