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

Change-Id: I79c73fbb0dfbfda9ead04d77bdb2be4464f82744