Merge "fix potential mediaserver crash in ACodec::getPortFormat" am: c3f020b2b9 am: 0f71d1fd50
am: 9da707bb02

Change-Id: I15a4e4a42757dd17a08e7fecd32add20ff77aeb8