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

Change-Id: I2b1ec09239483b669fe06362727ba995e9f480a9