Merge "Make _scan_nan a bit less visible for libandroid_support users." am: fbd8762e6e
am: b00d0984fd

Change-Id: Ibedfe6af4148d1d06db5845304ff2b9102f6d150