Merge "hiddenapi: Fix map insertion bug"
am: 5991b184a4

Change-Id: I92c747aa03cec414958082bee8b0d86b236ab713