Merge "Split datasource out of libstagefright" am: 229c543d08
am: 448242fe09

Change-Id: I75f9f8ee708348b40d7334b0e4216ec3eceeec22