Merge pull request #377 from asarrafi/ThreeTwoOne

[MOSYNC-2845] new version of adb.
Merge remote-tracking branch 'origin/ThreeTwo' into ThreeTwoOne

Conflicts:
	examples/cpp/CameraDemo/main.cpp