Merge "Add initial Keymaster 1.0 tests"