am 511ae054: am f256901b: Merge "64 bit fixes for NdkMediaExtractor" into lmp-dev

* commit '511ae0549f889c78a820693fdd7e27ea634c2cd2':
  64 bit fixes for NdkMediaExtractor