Merge changes from topics "libjnigraphics-fix-history",...

Merge changes from topics "libjnigraphics-fix-history", "validate-version-script-stub-tags" into main

* changes:
  libjnigraphics: fix map.txt typo
  libjnigraphics: remove typo markers