am 3e6d2b47: am 7fd1c7ea: Merge "Fix bootclasspath string initialization"

* commit '3e6d2b4749f62342cf98b95a43288a42ca98d7ed':
  Fix bootclasspath string initialization