Fix Repopick Errors

Fixes errors after the gerrit update yesterday.

Change-Id: Ie2a9a4371af682056acc7cdad5426e40f0f2504c
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'hydra/cm-11.0' into cm-11.0
build: Add QCOM target-specific config

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

Change-Id: I736c10a5e7e1f3d1e0de9e60f29b60add276f151
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0