Merge "Remove QCom specific flags" into oc-dev
am: cd43683371

Change-Id: I6abf03a512939f0290ca11d7301b4df015d7b912