Merge "Allow editing of samples in Android Studio"