Merge "Move Activity1 and Activity2 to API Demos area in development/samples."