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

Change-Id: I479ca19fb727cf923c29d73d27fe002b2e947ded