diag: Bring diag control message support up to date

The current implementation is out of date with the current
diag control messages. Make modifications to bring the
control messages up to date.

Change-Id: Ia5456db63146de6eef9bc3d00991197fa868f281
Signed-off-by: Dixon Peterson <dixonp@codeaurora.org>