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