Merge "Revert "mediandk: exclude libmediandk from media apex.""