Merge "Add libmediandk"