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