Merge "Updates the name of the native library wrapper class, adds options and removes hints."