Merge "Remove unused includes and forward declarations in libmediaextractor/include"