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

* commit 'f256901b83d393c5fe6d9b1cfb6391faa86cac72':
  64 bit fixes for NdkMediaExtractor