Merge branch 'unstable' into DA-308

# By rzaitov
# Via rzaitov (2) and magicgoose (1)
* unstable:
  <unstable> fix define
fix defines for android[2]
Merge branch 'DA-308' into unstable

* DA-308:
  fix defines for android[2]