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

Change-Id: Ia1251190bb8402279c26fe1c96357dfb103fab0e