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

Change-Id: Iebedf39dbdf0cc4627fac7add4047689c63ff329