Revert "Merge pull request #4 from halleyzhao/master"

This reverts commit dbf5ab260cece78f251e054d243e42e3410d2a3b, reversing
changes made to b3e63dc7faaad91f1118b5110c61da27c829fe57.

This duplicates a pending pull request which also fixes a webrtc quality
issue.  In addition the pending pull request is consistent with the Android
code base.

Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>