Merge "Update path for libmediandk headers"