Merge "Remove codec libs from base_system.mk" am: 03d3a36664 am: ed15824ac4
am: cd2a1d4a31

Change-Id: Ieac91be1045e8bc73f761834af93a0b23e075c14