am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread

Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'

* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
  add a fps counter to sanangeles demo