Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp * commit '99638e747251929191f7773d2a81bbea223f1e09': Turn on thubmnail capture unit test for media metadata retriever