Merge "Improve reference VHAL library."