Merge "Use ASM9 in tools" am: cb82e0cb3e am: 172e2c5a31

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2240208

Change-Id: Ie4b8ee69479ccc79826faa10ad1844a2f12730c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>