Merge "Add Keyguard package to platform builds."