am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit '554bd9578e0c8ec4eea8130abaca7c91fdc46e61':

am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':

* commit '2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f':

* commit 'a5df326138cdaf4874026c09e2967d8142eca811':

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

* commit '194529f1952e4d873c8262e09a40ac71872859d2':

* commit '8c131d5bf75499455ce287aeb0af30030282a000':

* commit '4104f751dbabfc2dd04adee381aa4d949f81dbe1':

* commit '662d2f44e91af91a37a59f1fe1697a00b6b724c9':

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

* commit '66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded':

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

* commit '7022c115663ac6e24afdc896fc6f155f1a9bc52c':

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

* commit 'efa53b19f45400ca98c1bb2dc1f5bfa87be033df':

* commit '211bb9125a78b3b8772afc196e16640a8b7f2f7b':

* commit 'd6be7db044050f9941ff7b7a3e57af0565d4e53c':

am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '5f8ef51529f07ae758ec4944759828a1414dbb7c':

* commit 'c1f9ebcefb026a84e369347ddc23a3e4c6e9c940':

* commit 'c017bb8c147d30641b36e6d16b9133c0dd9e8453':

* commit '6778e0a0198f602cab76daf6428a97292007dc71':

* commit 'bbda8b10152bbdb7d6057724f0e3e197db9ec108':

* commit '380d1b5a78de07a081b36c890321ac61a0fced1a':
  Fix the merge conflict leftovers.

* commit 'adfb09a08d450f356a69c74c0a80a3e4573e20b8':

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

* commit 'df9a6dffee90f5ff657265b415ee5eb9fb5e3960':

* commit 'ba363f1380e9b99e6606462b21febd2e4027e340':

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

* commit '4d7f9ad71771fff628e88d463af94b44457b7934':

* commit 'f105476adedac50be509ed36cbb187b92fca54d9':

* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1':
  You CANNOT change the global WITH_DEXPREOPT

* commit '94f522f907e3f34f70d9e7816b947e62fddbb267':
  You CANNOT change the global WITH_DEXPREOPT

* commit '49512cb01065b41c0113248c2c02800de1156d50':
  You CANNOT change the global WITH_DEXPREOPT

Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e

* commit '70eec2cabb5fa7bf8d7d492ec46905dae3df5a76':
  Fix NPE when clearing an extension in nano protos

* commit '58eb8e98d17971273548930a7e8d45e69995a2c8':
  Fix NPE when clearing an extension in nano protos

* commit 'd20f0a4260763531acf5de677e4830afe0bfc53e':
  Fix NPE when clearing an extension in nano protos

If ExtendableMessageNano doesn't have any unknown fields, trying to
clear an extension by setting it to null would throw an NPE.

Change-Id: I6abcdfcc0193de44f97b21dd6cc2f40604938a1a

* commit '9dde6a6d6b6f8e0a96fd3634f7e033fc30bc11e5':

* commit 'ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce':

Change-Id: I4c9cebcc6922a970daca2af002c96bc7e8e102b8

* commit '33a6680ab98977cd5b9b7b03f4875b9265cfec3b':
  Support generation of Parcelable nano messages.