Merge "Undefine NAN before defining it again" into aosp-main-future