Merge "Adding target (sdk-repo-platform-tools) that is used by gmac(sdk_mac) build." am: 460f70bb52 am: 7022a3f179

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242225

Change-Id: I35687b3125cb1f0213a6e6dc7ec196e63f4dcad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>