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

Change-Id: Ibce40a142d4dc604e66674505ad269cd1cdc8b20