[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library" am: 51098832de am: ce0e45045c -s ours am: a0f699b7a5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/armnn/+/2653625 Change-Id: I772b687fe083db22b6d25a5a32696a79439507df Signed-off-by: Automerger Merge Worker <[email protected]>