Merge "NdkMediaExtractor: remove `disconnect` from NDK headers" into pi-dev am: 036e93aa10
am: ad33f439ee

Change-Id: If8cfb5bda48f46e0aa99651657641a9944064f0b