Support for build prop collection in STS for APFE integration
am: 3a40fc4e99  -s ours

Change-Id: I91cfcf774780162c78d3d03bb57f3cd666243089