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

* commit '46060c08fd6f9aa6bb52800d0162cef59f0a796d':
  Fix Eclipse .classpath file for JB.