Add Buffer code to Android Facade implementation