Merge "Generate Java host library for keystore2 flags" into main