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

Change-Id: I918ac2b8f381bab86823e81eca28a68998ca25bf