Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait"