Merge "Remove QCom specific flags" into oc-dev