Fix compilation errors in generated code. am: 83eddb5d44 am: 0750936003

Original change: https://android-review.googlesource.com/c/platform/system/tools/sysprop/+/2943765

Change-Id: Ied6757531e5151425f3b90800ac92444b3041074
Signed-off-by: Automerger Merge Worker <[email protected]>