Locale: Retain compatibility with 4.4 APIs

Wrap the new methods from change I9b2d7f8d17f970d1b57111dcfe92c16e68b0fa67
in the previous public method.

Fixes libcore.icu.ICUTest#test_localeFromString

Change-Id: Icbffb5d5b55329f29c791b57d019817b5c298431
Revert "Fix a CharsetEncoder bug."

This reverts commit 653203d1e85f9eca7467ecab60c6000f415aae5d.

Revert "Fix an ASCIICharsetEncoderTest testcase."

This reverts commit fdd61c877cdd981789c976c2418aec0285af7233.

These patches are breaking the tests.api.java.nio.charset.* tests,
back them out. We can't change the underflow conditions without
breaking assumptions in the standard test packages.

Change-Id: I519e21cfef764b7b00fd37d22dc7509f902d3250
Merge remote-tracking branch 'github/cm-11.0' into HEAD