Separate demo into mobile demo and desktop demo

Change-Id: I957880e1866c9b2a02ff07d22009ef21116a28ef
Add test files to dependency tree

Change-Id: I03d70b76f48c09f5e41593b403809f8b5c041f9c
Merge "Separate demo into mobile demo and desktop demo"
Merge "Add test files to dependency tree"