resolved conflicts for merge of 9858df8b to jb-dev-plus-aosp
cherry-picked from AOSP
"""
removing uiautomatorviewer from frameworks/testing
It is to be moved into sdk
"""
Change-Id: I8b2fc6bcdceda0705d7e2f337a7dc71c3451c26c