Merge "Add an empty directory so we generate android-26." am: 42d214b284 am: 8feb786646
am: f3f036ea10

Change-Id: I6d2d4c9417dc0e7e963ef2d7f10b2ce03d50a8cc