am 29fa33a6: am 47a0ba95: Merge "update include paths and symbols for eclipse" into jb-mr2-dev

* commit '29fa33a614ab3ad6f357d50662dfa03f9719e227':
  update include paths and symbols for eclipse