Merge "Added JSON-based E2E Vhal test framework" into pi-dev