[automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff am: 69d82611 am: 77b67755 Change-Id: Ie12a68445f875eed0ab7f9deaac4ce315550de66