am 49ba77b4: am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev

* commit '49ba77b441d0dc32c2423cf635e81dc31514d2a8':
  Revert "Add api 20 to list used by reference docs."