Merge "Clean up #includes in keystore/include"