Merge pull request #2 from huahang/master

Fix build break, etc.
Revert "Update support-v4 version."

This reverts commit 8cb3e009ae36a9e704db30af419f11ad56f68c86.
Merge remote-tracking branch 'upstream/master'