Merge "Fix link-type check warning on com.android.mediadrm.signer"