Merge "libadf: libadf is deprecated so remove it from Android.bp"