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

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