Merge "Convert libmediandk to Android.bp" am: 77c52d2f58 am: f90158f892
am: 89accf7e19  -s ours

Change-Id: If4079984d233bb64ed97e80d9bc6cecf94b5c7f2