Merge "Wrap incomplete keymaster1 implementations with sw keymaster."