Older targets use a slightly different version of map around the hole which has different variable names. Account for this in the code. Change-Id: Ia657b265dc6f34c9fb33f71c1ef62dbf0c0c2114
