am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."

* commit 'f36d011911afcfb7e774da3d23f0a8583e24429b':
  Fix Eclipse .classpath file for JB.