Also remove ApiDemos from the package and instead add each library-specific sample app to each v## folder. Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
Change-Id: I4324df1814ae9450b254b22c7bd1b28e4826a29b