ALLJOYN-2482: Android specific code should check 'QCC_OS_ANDROID' rather than 'ANDROID'.

Change-Id: I1283f547427bb884273f9a88ae4690ed78ef6240
Prep. Release 3.4.1
ALLJOYN-1973 Must define GTEST_OS_LINUX_ANDROID for unit tests

GTEST_OS_LINUX_ANDROID must be defined for the when building the google
test or we get a compilation error reported from the function wcscasecmp
is encountered.

Change-Id: Ib6d6dc0b8b5b781daf70a3bdd4c3c3bb4cd8f3cd
ALLJOYN-2480 Make RemoveSessionMember disposition codes consistent.

Change-Id: Ic0d737f376a3f7ad36f9c84705a58e43665ad149