Merge "NdkMediaExtractor: add disconnect API" into pi-dev