Merge "Remove unused Android.mk files in chromium-trace" into main