Merge "convert flag options and values in the same line" am: 49e4187e am:...

Merge "convert flag options and values in the same line" am: 49e4187e am: 54fbcf28 am: d98fb8a3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751550

Change-Id: I6f2271964a670668f2e9f857422bda30790f7cef