Merge "Set tests targetSdkVersion to be >= 17"