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

* commit '47a0ba955311ad478edc3e5a973b854bb6ad39af':
  update include paths and symbols for eclipse