Merge "Remove unused Android.mk in NamespaceTest" into main