Android

The demos are ready to be merged again.