NCI command, response, notify messages are unified

Bug: 197333653
Test: build ok
Change-Id: I59fe02dc68453ec384fcd424d9c7365a858c4676
3 files changed