Merge "Update openjdk builds to use clang-r383902c."