Add back CAF media... the aosp one hasnt been updated

Change-Id: Ic12d3d0e1e885390efff9daf9d6b4c49f3790590