Merge "Update path for libmediandk headers"
am: 9d9aab48fa

Change-Id: I339300d2e0c230069af0a7f08caff6449de37c85