Merge "hiddenapi: Fix map insertion bug"