Merge "ANDROID: Re-enable breakpoint_test for x86_64"