Merge "ipq6018: fixing CONFIG_TZ_END_ADDR address"