am fc899621: Merge "Remove CtsTestStubs" into lmp-dev

* commit 'fc8996212db0d8a8c3a1396352519bf3e2abc271':
  Remove CtsTestStubs