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

Change-Id: I2bf1985d65565598e996cebbd7e0ed51eac8a952