Merge "ANDROID: Re-enable breakpoint_test for x86_64" am: e0c702006b am: 7e94588635

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/1997252

Change-Id: I83be2add0176c8f1ae3bab98fba3edb05f54246c