Merge "Add stubs for sun... classes for hiddenapi"