Waning fixes for Android samples