Merge change 25176 into eclair

* changes:
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer