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