Merge "Make libmini_keyctl_static available in recovery"