mojo: Fixing array serialization for java bindings.

mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java

Index: mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
index 52a9cbd8c5be90167d2054d42aba0827ad531a7b..fac5ad382a43c48a534eccd66292fff1cc613ece 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
+++ b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
@@ -148,7 +148,7 @@ public class Encoder {
      * (resizing the buffer if required).
      */
     public void encode(DataHeader s) {
-        mEncoderState.claimMemory(s.size);
+        mEncoderState.claimMemory(BindingsHelper.align(s.size));
         encode(s.size, DataHeader.SIZE_OFFSET);
         encode(s.numFields, DataHeader.NUM_FIELDS_OFFSET);
     }
@@ -438,7 +438,7 @@ public class Encoder {
     private Encoder encoderForArrayByTotalSize(int byteSize, int length, int offset) {
         encodePointerToNextUnclaimedData(offset);
         return getEncoderAtDataOffset(
-                new DataHeader(DataHeader.HEADER_SIZE + BindingsHelper.align(byteSize), length));
+                new DataHeader(DataHeader.HEADER_SIZE + byteSize, length));
     }
 
     private void encodeByteArray(byte[] bytes, int length, int offset) {