Waning fixes for Android samples
Merge pull request #778 from asmorkalov:android_wanr_fix