Merge changes Ib5923f6c,I1814f07e

* changes:
  libstagefright_id3: Add host support
  Added libmedia_datasource_headers header library