Merge \"Merge \\"Remove framework dependencies on Support* demos\\" into nyc-mr1-dev am: c295a4b23d\" into nyc-mr1-dev-plus-aosp
am: 821bfcbde8

Change-Id: I7392f929a6799a173d7ca36609a1d67ed2e1e547