resolved conflicts for merge of bd38710b to master

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewDebug;

import android.view.WindowManager;

import android.view.ViewGroup.LayoutParams;

import android.view.ViewParent;

import android.view.ViewRoot;

import android.view.ViewTreeObserver;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;

import android.view.animation.AnimationUtils;