Merge "Adds default keymaster service to the early_hal class" into oc-dev
am: 8080d70564

Change-Id: I45857b74581c2e7b4c321cc13b8ebc77546fb7a2