Update sample with latest changes from Android SDK