Merge "Fix bootclasspath string initialization"