Merge "Javadoc fixes to ScaleGestureDetector for SDK builds"