Merge changes Iaa3f64f7,I890d2e23

* changes:
  libstagefright_mpeg2extractor: Add host support
  libstagefright_mpeg2extractor: Remove libmedia_headers dependency