Merge "Adds default keymaster service to the early_hal class" into oc-dev