Apparently we still build non-NEON variants of bionic! This reverts commit e57d7723. Change-Id: I5436d913b1dc9b7d8f5e6afaea9b45002be7e825