am 33c5d45c: am ea7dfba7: Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev

* commit '33c5d45c0c8710574d5193b5dc7984ac21a4df75':
  Add ApiDemos for secure surfaces.