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

Change-Id: I5a9b6b4cd09c5ff48bad3461780a5964c649d162