Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b...

Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b am: 4f8d04b6 am: d75823a4 am: 4d1a91b4

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

Change-Id: I975fdc387f0eefd898dd0475521c9b43ffdc3e44