Merge "Remove unused IMediaSource Implementation, AACEncoder" am: 69d60c1372
am: 1bf4543ffb

Change-Id: I9795911abe47c0e8c2be71bbc9f63525bcba9928