Second consolidated commit for mobile packaging.

Ready for android