Add back qcom if removed in cleanup

Fixes numerous buids

Change-Id: Ie018592ae7514603a0c032ad7cef50317a6cadb1