Merge "Add ims audio codec to Extra" am: bfe145da2d
am: d68dc8016f

Change-Id: I864c1ee6ddbeb6e7ca14c7759d7cc5979506820a