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