android-L is renamed as android-21 in both coming SDK and NDK Change-Id: I57b0dbe4d6e8add178dadfa6306bfc40aad27206