Merge "Adding ability for hal keymaster to read vendor SPL" into pi-dev