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

Change-Id: I98d0089e628e254752a6ed0f244d1060d2ef01c4