Merge "cm: Include private signing keys if present" into cm-10.1

commit 6b098f654533cffda17e191c0191051314feb3ad