Merge "Revert "mediandk: exclude libmediandk from media apex."" am: 702f9a05c6
am: 69c4fc0c0e

Change-Id: Ia9aa2bf4019abaca869cc3a57d2dabacc1611242