Merge "Use rkpd if the build flag is set"