Revert "Improve idmap2 xml parsing"

This reverts commit 58cdc2a8226e8618331a81c1e1b77a4421bb5629.

Reason for revert: <aosp/1129572 caused a build failure>

Change-Id: Iecae19877dacf9ec5c2b2bc59dca362f573e9a7a
13 files changed