am 9365c8fa: am 99638e74: Merge change 27466 into eclair

Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'

* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
  Turn on thubmnail capture unit test for media metadata retriever