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

* commit 'ea7dfba76c1244dce72094da1616a33a725f0781':
  Add ApiDemos for secure surfaces.