change buffer

Change-Id: I2a82d99d06a1b43de8d59722e2aa1360c7cfb775
Merge branch 'kitkat' of https://github.com/buffer-dev/android_build into kitkat