Remove Qualcomm and Sony build adaptions

Change-Id: Idff4889ee9769065e78ad7b5a3c5f42e18efdbd9