Merge "msm8974: force the kernel/ramdisk/tags addrs to sane values"