Merge "libandroid: map remove extra '#'" into main