am 6706b71d: am 86e67d70: Merge "frameworks/base: delete TinyHashMap"

* commit '6706b71d7cfb9a916fd482189c04a0d59c19c103':
  frameworks/base: delete TinyHashMap