* 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 '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf':
  You CANNOT change the global WITH_DEXPREOPT

* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':

Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e

This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0

am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':

am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'f4af48aeb5293a6c8583749e1a6f7a20508324f3':

* commit '8113c1862afb4ff3b7ab4ba0044c5cb191c1e454':

* commit '99c9801813fdc2eccd5db391c00d0250c327e344':

* commit 'dd38a37eae035fe0f724438624694f1cf77a0ade':

am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '3f1679bb03e1d08f08e7b4ca2d024345201d7f01':

* commit 'e887563a':
  Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""

Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c

* commit 'f213b0c6a86503ad752139f04f343578df45db07':

* commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':

* commit '9141054bc24597968ddb94fb466c07cd2a933706':

* commit '5c3544dd69160dc00a7786977da220265a7c43c4':

Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38

* 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 '6a1f70ab855a3c222783596c92574267e3cfa6e8':

am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '6adb3df8b7d5f5deb42b6b4a9e7fe76638faa6fe':

am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'a5273888480392ff8a8b0ea3af6617e18dbb1ed2':

* commit '81d0f437ba2bb34cd59a019c2f15f862a9c5d45b':

* commit '55c3d6d9fa8287676c6502ad20199bd932730681':

am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '7c0eadd45cb4e0fef8afffe1626c2e4711418b49':

am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'da929e3ea6310e7dc46745f191200afc489600e6':

am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit '6597e4f210be48b731e995c6c9950046ccf7689b':

am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'b3ad7eaeb3233d9842a74e2252efa189d4c0524a':

am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '4115d56f3d03ca788a08a0a1eb6c79fa107550d3':