mako: qcom stuff cleanup

Change-Id: I6b9247440562eb155a9541bd965f939dc81841cb