am 7a09d501: Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev

* commit '7a09d501fe339203a1a38b35dbc13dc0dc31dcf9':
  Removed rtp timestamp patching hack in ANetworkSession, advertise