am 8d6a35c1: (-s ours) am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."

* commit '8d6a35c1cae7e73a6f15d581952b7764df3e0365':
  Fix Eclipse .classpath file for JB.