am e3fd2a23: (-s ours) Reconcile with klp-release - do not merge

* commit 'e3fd2a237fd9f9f9bed7a0e34008d30b8c20e4e3':
  More Charset test fixes.
  Work around icu4c causing canEncode to always return true for surrogates.
  Fix CharsetTest for SCSU and Shift_JIS.
  Fix AIOOBE in Method.compareParameters.
  Fix sign-extension of type indices.
  Show size/alloc/free per Dalvik heap space in dumpsys
  Merge "Fix DateIntervalFormat to take time zone into account."
  NativeCrypto: check that npnProtocols != NULL