Merge changes Ib4d0e0c0,Iea8f4a23

* changes:
  libmedia: remove skia include
  stagefright: remove dependency on skia
tree: 30e562853bad2571ad87381d21df89e73e7b18ad
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/