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

Change-Id: I6d32a7e9385379a8ea356be600972a1c70b344e6