Regenerate Android.bp patch with correct context so it applies cleanly am: a0af7b74bd Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/3118326 Change-Id: I6c35ccb28a83c44c1a9cf35e6720c13ed6007cba Signed-off-by: Automerger Merge Worker <[email protected]>