am bcbf17a5: am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread

* commit 'bcbf17a5823380b59ad5617c79c1f14d365bdc23':
  Return a zero length byte from toByteArray instead of null.