Merge "Update path for libmediandk headers" am: 9d9aab48fa am: d1d283692f
am: 5fa4ae0c33

Change-Id: Ia938c9e716d613bed3ed5b0903b4b937e2699987