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