[automerger skipped] Add aapt2 to otatools.zip am: 0bc382e4a7
-s ours
am:b8fdffb24c
-s ours am skip reason: change_id Ib3a4740506f29ebab6930767f2aa8a0b5c4ba053 with SHA10f12536e6b
is in history Change-Id: Idd31fe7a8a3bee250a47f109d24dbcb9b67340a9
This commit is contained in: