am 6720d4bd: Fix classic_locale for Android.

* commit '6720d4bd042bc22fc809c6ebc0eab60eab2a56c1':
  Fix classic_locale for Android.