Renamed some demos and update Android and Windows Store solutions.