Merge "Fix building service command with musl" am: ed1abd80c1 am: 77685f195c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1931937

Change-Id: I12e29209ebff7734fb870e674a9ea152be539eab