Merge "ScaleGestureDetectorCompat should only call kitkat when sdk  > 18" into klp-dev