Merge "Specify -mcpu=cortex-a15 for krait CPU variants."