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

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

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