Merge "Update openjdk builds to clang-r416183b"