Merge "libkeymaster1 split"