am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread

* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
  DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.