am 279430c9: am 5f3be2dd: Merge "Add libmediandk"

* commit '279430c90af52698718b30d27e29ee3c570c96ea':