This reverts commit 7809ef419f. android-L is a preview, we want to add android-20 when it comes out.
7809ef419f