Merge "fix potential mediaserver crash in ACodec::getPortFormat"
am: c3f020b2b9

Change-Id: I735aca01f5d17041dd907c43cb043b61853d021f