Merge "Update dream demos to use support lib."