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