Merge "Migrate libmediandk to ndk_library." am: 84404f068f
am: c84b665cb4

Change-Id: If98cf0434218afca6436a41ec25cfec670e27072