Merge "64 bit fixes for NdkMediaExtractor" into lmp-dev