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

* commit '287aec7f199188bd5501ebb264c6c4991556ec0f':
  Removed rtp timestamp patching hack in ANetworkSession, advertise