Fix Repopick Errors

Fixes errors after the gerrit update yesterday.

Change-Id: Ie2a9a4371af682056acc7cdad5426e40f0f2504c
(cherry picked from commit 67eca737008b0bbbf3d0d4d40e2d1b23119db672)
build: Add QCOM target-specific config

 * Needed to support global DirectTract config on legacy targets
 * Let's also eliminate some boilerplate

Change-Id: I736c10a5e7e1f3d1e0de9e60f29b60add276f151
(cherry picked from commit 89c057bc1c06247098bb12d09c8c847b4a84af9f)