Merge changes I45517c7b,Ib13825c9 into gingerbread

* changes:
  Fix the build.
  Cherry-pick the change from master for the setRPort in Via header.