Merge "Move android.rscpp out of CtsTestStubs" into lmp-dev