Merge "Remove obsolete Android.mk for clang" into main