Merge "Allow customized registration of codec services" into pi-dev
am: d549c0835a

Change-Id: Ie6135acf7a458caac941863499ce9b0b22f9a7ba