Merge "ipq6018: Skip uboot relocation and setup CP15 barrier"