Merge "Make _scan_nan a bit less visible for libandroid_support users."