LPS-48313 Sync build-common.xml that had bad reverts
Sync SDK