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

* commit '676bf550071505e6b1153e0674fd46b6a2c2129e':
  Update ApiDemos to use API 20, default theme