ASAN: correct handling of BONE_STOCK == leaving things BONE STOCK.

Change-Id: I30966dd614cd662cf37f9ed42c65cba31d9266d2