Merge "Add an empty directory so we generate android-26."