Merge "Fix the name of the native app glue lib in a header comment"