android: Fix getMachineId

Reviewed-on: http://gerrit.aldebaran.lan/21423
Reviewed-by: llec <llec@aldebaran-robotics.com>
Tested-by: gerrit
Reviewed-by: cgestes <gestes@aldebaran-robotics.com>
(cherry picked from commit 0b88f0a71f242745133c292917fb312024e3e95b)

Conflicts:

	src/os.cpp

Change-Id: I6e8ed17b6935341c0413584c358d04be59f66bfd
Reviewed-on: http://gerrit.aldebaran.lan/23966
Reviewed-by: ncornu <ncornu@aldebaran-robotics.com>
Tested-by: gerrit
Reviewed-by: llec <llec@aldebaran-robotics.com>
Fix Android compilation

Change-Id: I57ebc3ca85a49ef41d5f05ebcb02f3c43e50b414
Reviewed-on: http://gerrit.aldebaran.lan/22884
Reviewed-by: proullon <proullon@aldebaran-robotics.com>
Reviewed-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
Tested-by: gerrit
Reviewed-on: http://gerrit.aldebaran.lan/23997
Reviewed-by: vbarbaresi <vbarbaresi@aldebaran-robotics.com>
Tested-by: vbarbaresi <vbarbaresi@aldebaran-robotics.com>
Fix resolution of qi::log::log

Change-Id: Id47307bdca1271d2daf1b9cd9e6993b7968ea417
Reviewed-on: http://gerrit.aldebaran.lan/23740
Reviewed-by: vbarbaresi <vbarbaresi@aldebaran-robotics.com>
Reviewed-by: ncornu <ncornu@aldebaran-robotics.com>
Tested-by: gerrit
Reviewed-on: http://gerrit.aldebaran.lan/23998