am 7fd1c7ea: Merge "Fix bootclasspath string initialization"

* commit '7fd1c7eabc6c12a2ff67ef58860aae761c92136e':
  Fix bootclasspath string initialization