Merge "Add getCodecCapabilities as a supported function." am: 7c2fd0b19a am: 79f0e34c83
am: 753b078297

Change-Id: I11a72dbba4b72910cd3ce65b0f80e14bc1e40385