Also do the following related cleanup - Remove references to deprecated BrokenTest and KnownFailure - Switch CTS tests to build against SDK and not private android.test.runner where possible Bug: 12924356 Change-Id: If6151b836456eec4838f8d7d6e11c9834c007fca