Merge "Mark libmediandk as LLNDK." am: 0b38014655 am: 097aa76330  -s ours
am: 1caa256b05  -s ours

Change-Id: I8edefd47a5863e524781c8772a5dbc510db43311