Add additional Java roots to Java source roots and clear diagnostic messages before the next analysis round. (cherry picked from commit 17ad807) Original commit: 84d62f37eb
84d62f37eb