am c05783e9: Merge changes I45517c7b,Ib13825c9 into gingerbread

Merge commit 'c05783e9d9bf48a86e90733f32c65a5093e9ed37'

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