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

Change-Id: Ife74d28cfc2169386bff2856bbcfb78c5f0e2628