Krait improvements

Change-Id: Ib9ee8e0e86cc17a4170c89837ef663cc112b5a4b