Merge changes Ic26b25e7,I653571d6 into nyc-mr1-dev

* changes:
  HWUI: track upload & recent usage in font cache
  HWUI: calculate used memory in FontCache for gfxinfo