Merge "Pass #8 for bringing android.view CTS tests into the new world"