Merge "Remove codec aggregation/summarization" into oc-mr1-dev
am: 1210f3fd4b

Change-Id: I2d32790e37f5925860c57b8bf5f0c4526b3eb860