Fixing profiling compile error
Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
Merge pull request #2257 from dumganhar/master

Fixing compilation errors when CC_ENABLE_PROFILERS is enabled.
Update AUTHORS
Removing unused codes.
Merge pull request #2258 from dumganhar/master

Removing one line unused code in PerformanceNodeChildrenTest.cpp
Updating CocosPlayer to latest version. Includes following changes:

1. Adding support for changing orientation
2. Updating communication protocol to latest CocosPlayer protocol. Including UUID and filelist messages
3. Fixing unzipping of ccb files to maintain proper directory structure
Adding all CocosPlayer Android resource folders for CCB and updating to latest version
Merge pull request #2259 from rohankuruvilla/ccbreader

fixed #1861: CocosPlayer Android update.
Merge remote-tracking branch 'remotes/upstream/master'