[NAN] Reorder parameters of send message method(s) per API review [DO NOT MERGE]
am: 3da7c88425  -s ours

Change-Id: Idf7a081d619c5b66957fca136fc7e016ea1ea2cc