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