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

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

Change-Id: I379e2aa424dbe9a250564b1139fcdf4d97a43c7d