Merge "Make _scan_nan a bit less visible for libandroid_support users." am:...
Merge "Make _scan_nan a bit less visible for libandroid_support users." am: fbd8762e am: b00d0984 am: 9ef11a7f
am: 4f383811
Change-Id: Ide2a3d9211b2046d6ceb6fc295413c5497cb6ba1