am 365f9fbb: Merge change 23918 into eclair

Merge commit '365f9fbb3e5444f046ee569f168a231c8106ec09' into eclair-plus-aosp

* commit '365f9fbb3e5444f046ee569f168a231c8106ec09':
  do not merge: Josh's optimized HashMap and Hashtable