Merge "NdkMediaExtractor: fix advance return value" into nyc-mr1-dev am: 96d37954fc
am: 9efd0f6457

Change-Id: I70ba35fb496a001c95b31c038280a2bc4b318f3d