[automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff Change-Id: Ibc95b9364f0d1743ada53037cd19c3bfbf181648