am 3ccf4b43: am 676bf550: Merge "Update ApiDemos to use API 20, default theme"

* commit '3ccf4b430d9c7339038d07c11889d221992e1121':