Recent Commits to brotli:master

Merge pull request #1458 from rbri:java_code_cleanup

PiperOrigin-RevId: 900612609