Merge commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4' * commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4': Add partial support of Android-specific properties.
Merge commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4' * commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4': Add partial support of Android-specific properties.