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