Merge "update include paths and symbols for eclipse" into jb-mr2-dev