(c-styles-alist): In "java" style, set c-hanging-comment-starter-p to nil to preserve Javadoc starter lines. (c-set-style-2): Fixed broken implementation of inherited styles. (c-set-style): Call c-initialize-builtin-style. (c-initialize-builtin-style): Handle c-style-variables-are-local-p.