Merge "Use asm built from source." am: 3726099bf3

Original change: https://android-review.googlesource.com/c/platform/development/+/2304514

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