am 8d774c4c: am fd9ffb6b: am b13d9f16: (-s ours) Merge "Update dream demos to use support lib."

* commit '8d774c4c3e12c317cfbd3435c4a2be83d3c2e02e':