Remove obsolete flags and repositories

Change-Id: I5652d55b735c759d21df47df937c0f48fe7e9811
Merge branch 'remote' into mkl