Merge "Delete some unused bitmap walking code"
am: 462e21cc8d

Change-Id: Ie01f34d37f895fadfb6e657deacfa8239ce6e4ba