Final(?) API 21.

Also roll the 20.txt definition back to what API 20 actually was.

Change-Id: Iae37ef29776975d2c552e8299ea71cde51723438
2 files changed