[build] Use $(AndroidPlatformId) when appropriate
#4356
Merged
$(AndroidPlatformId) when appropriate
#4356