integrate NSScanner fix from glennganz-integrate
integrate NSScanner fix from glennganz-integrate

cneira/cocotron,Suninus/cocotron,gemu2015/cocotron-sierra,crystax/android-vendor-cocotron,gemu2015/cocotron-sierra,cneira/cocotron,ruppmatt/cocotron,plasq/cocotron,JackLian/cocotron,plasq/cocotron,crystax/android-vendor-cocotron,yuhangwang/cocotron,yuhangwang/cocotron,yuhangwang/cocotron,guestOS/guestOS,ruppmatt/cocotron,JackLian/cocotron,cyclaero/cocotron,JackLian/cocotron,cjwl/cocotron,cneira/cocotron,Suninus/cocotron,gemu2015/cocotron-sierra,guestOS/guestOS,yuhangwang/cocotron,crystax/android-vendor-cocotron,Suninus/cocotron,plasq/cocotron,cyclaero/cocotron,JackLian/cocotron,cjwl/cocotron,plasq/cocotron,cjwl/cocotron,guestOS/guestOS,cyclaero/cocotron,crystax/android-vendor-cocotron,ruppmatt/cocotron,cyclaero/cocotron,gemu2015/cocotron-sierra,Suninus/cocotron,ruppmatt/cocotron,guestOS/guestOS,cjwl/cocotron,cneira/cocotron