Merge "add a fps counter to sanangeles demo" into gingerbread