am 049dc0cc: am 4ed83a2b: merge in KQS81M

* commit '049dc0cc7f54707f8759ba07cae4f18d902686b4':
  *HACK* assume android requests 1 more buffer then we specify