Merge change 20133

* changes:
  don't crash when SurfaceBuffer::writeToParcel is given a null argument