Merge change 25201 into eclair

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