am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'dde8a694bae836c024acd5dbed7690a3d2f5ee38':

am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '54ad71fb613edb446a3f28de79e1e0d11b345fc5':

am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '242aa182dd320e27e551e1a0f5a1aeafb3f73fb5':

* commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':

am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':

am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'ed67cd79c6deb58ba287a45753b076bed3a817c5':

am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '1c524da854c2351a5fc92f77fa4f63980ba5b4c7':

am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d':

am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'a94fe6cb54165b8139b719f287cdad4973f93643':

am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit 'b09fd32de981b889f973de772a696cef47162ebf':

am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'a19dbf97df8416851dda1e01c5b27642d04e257a':

am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit 'e6780389313c3269c725a4f245bba4513ec6879c':

am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '5a9d43b211ede37422ca16feb06fa6f04a450f18':

* commit 'c0bc136bb738812862d45b53f8546200741d558b':

am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit '3a2460f3dda97d12e4f592d727549fe7b1214b40':

am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'd801ea90d87ceb1aa4d2cf591885c3d2c885d1d8':

am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172':

am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79':

am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '7a8797abb1f80e93522b0a7c7acd177afb3ba0a4':

am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':

am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit '6d1e97097eca8f50e629c10fcabbffbe064868b8':

am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '998ea484ba19563fd32ba3e2e16e785f449afa74':

am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':

* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':

* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':

am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':

am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':

am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':

am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':

am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':

* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c':
  Fix how getRepeatedFieldArrayLength works

* commit 'f91b7fa173d2aa76ce593c20e429bd8d480599ea':
  Fix build, by using external/zlib instead of system zlib

Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51

* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
  Fix the aprotoc target for Windows.

Allows aprotoc.exe to be cross-compiled when building the Windows SDK.

Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c

* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
  Don't return NULL from {Boxed}PrimitiveTypeName.

The behavior of the string ctor is undefined when you pass NULL. This
is checked strictly in C++11, so fails to compile.

Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903