Merge "msm8960: Reduce kernel memory to account for the increased TZ Apps size."