Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 am: c074f1bb7f
am: 82842e8223

Change-Id: I51b625ca4f3ae18b3331830cce1bb2653893c5be