[automerger] Make bound check proper in bbf_Scanner_addOutPos am: fb710d3c6a am: f2dd438ff3

Change-Id: Ic0256f12a28616f0b3c1379d704bef24c0dfbcb5