Merge "Add (but @hide) String.isEmpty and Locale.ROOT." into dalvik-dev