fix for bug #3219 (undefined reference in GPU samples)
In Java bindings, wrap version constants into functions to prevent inlining.

Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.

This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images
Missed a file previously...
Added back the new header file placeholder.
Updated some code that was missed during rebasing.
Cleaned up additional rebasing artifacts.