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.
tree: 3958add020049d932d7edb39bd154ab3815c66bf
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/