fix defines for android
Merge branch 'DA-308' into unstable

* DA-308:
  fix defines for android