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

Change-Id: Ice46324de7c8cfd539f5ebea58b6f1c63cea8383