Fix overrun bug in MapBootImageMethods am: 9bab2374d3
am: 571437e5df

Change-Id: I4a4cce01b69ccd389b3088313df2eec06c8cff32