Android samples working again after engine changes