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

Change-Id: I886e8c821a047c3ea303412aab78fb3885e06e85