Remove framework dependencies on Support* demos

Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
2 files changed