Merge "NdkMediaExtractor: remove `disconnect` from NDK headers" into pi-dev