Merge "Convert libmediandk to Android.bp" am: 77c52d2f58
am: f90158f892

Change-Id: Ifb02d9cd103941aed0b5f55bcc0c892e5ffce76f