DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library" am: 5c9d0b69c7 Original change: https://android-review.googlesource.com/c/platform/external/ComputeLibrary/+/2653624 Change-Id: I5c147d740c96182f8baf803b7ef6e26db2eb0e46 Signed-off-by: Automerger Merge Worker <[email protected]>