Merge "ipq5018: Remove ipq5018 related changes."