Merge "Fix MediaMetadataRetriever seek option OPTION_CLOSEST" into nyc-mr1-dev