Use VERSION.CODENAME to check for N APIs am: 5c502763bb
am: 371cccf0b2

* commit '371cccf0b24a939e03d612fdb3387e77153c6254':
  Use VERSION.CODENAME to check for N APIs