Merge "Undefine NAN after including it in Looper.h" into sc-dev-plus-aosp