Merge "CCodec: move Buffers out into a separate file" into qt-dev am: 6a3c35347f
am: cd682c235e

Change-Id: Id4354537ac9d4053a9b5a9f128b890fb11f9b532