Add bionic krait optmizations/cleanup