Merge "Use -target 8 for android_uiautomator"