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

Change-Id: Icca9db0e0bb876955d852dc7104bca523d7f11c9