Merge changes Ib4d0e0c0,Iea8f4a23

* changes:
  libmedia: remove skia include
  stagefright: remove dependency on skia