Merge "Move DataSourceUnwrapper and MemorySource to ID3 class" am: 381d0e4d68 am: dc2bdf1560 am: 4817c71fb1

Change-Id: I6f24d5ad6a5a92b23a0a9ef24ee2f6f56616b8fb