Use the functions intended for adding Soong config variables.

Test: m
Bug: 172480615
Change-Id: I04ead1eed802747aa7eea5c7b354d7cc3d05c40f
2 files changed