Merge "Fix asan build: Fix compare function in BitTable." am: 61ee8fe6e0
am: 045f488c46

Change-Id: Ic8bb69eb908596374c9c55b22eab0e6045a83585