Merge "Fix MediaMetadataRetriever seek option OPTION_CLOSEST" into nyc-mr1-dev am: 2f9fc81fbc am: 27884dd943
am: 6c185f5ddb

Change-Id: I53ff8557919ad1cabbded926c6eac7b2d602dba4