Merge \"Enable the demo launcher package as well.\" into nyc-mr1-dev
am: b5b2c196a8

Change-Id: Ie5c2c249a046edbd9c6f2347056f121b96b12284