Merge "uiautomator_sdk_v* are java:sdk"
am: cac40badf7

Change-Id: Id8dea963e7cfe4c926b4f572041e4b6f495dc8d2