Merge "Use asm built from source in framework tools." am: bc0e39459f am: fef043d4ea

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

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